Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 2 Mar 2006 02:21:38 +0000 (03:21 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 2 Mar 2006 02:21:38 +0000 (03:21 +0100)

Trivial merge